From: Chris Lawrence <lawrencc@debian.org>
Date: Mon, 9 Jan 2006 01:09:52 +0000 (-0500)
Subject: lsb 3.0-14 Debian release.
X-Git-Tag: archive/raspbian/10.2018112800+rpi1^2~252
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=eea7067ad370ee0f3bd2fcbd2a2bd457900123d8;p=lsb.git

lsb 3.0-14 Debian release.
---

diff --git a/debian/changelog b/debian/changelog
index 8bd0bb2..9094c99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lsb (3.0-14) unstable; urgency=low
+
+  * Allow lsb-base to be built on sarge.  (Closes: #345984)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Sun,  8 Jan 2006 20:09:52 -0500
+
 lsb (3.0-13) unstable; urgency=medium
 
   * The "answer all the questions in the changelog" release.
diff --git a/debian/control b/debian/control
index c8f2e5e..4bc0054 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: lsb
 Section: misc
 Priority: extra
 Maintainer: Chris Lawrence <lawrencc@debian.org>
-Build-Depends: debhelper (>= 4.1.13), po-debconf (>= 0.5.0), dpkg-dev (>= 1.13.2)
+Build-Depends: debhelper (>= 4.1.13), po-debconf (>= 0.5.0), dpkg-dev (>= 1.13.5)
 Standards-Version: 3.6.2
 
 Package: lsb-core
diff --git a/debian/rules b/debian/rules
index cbecbf7..4902e01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,15 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
+DEB_BUILD_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null)
+
+# Take account of old dpkg-architecture output.
+ifeq ($(DEB_BUILD_ARCH_CPU),)
+  DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+  ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
+    DEB_BUILD_ARCH_CPU := amd64
+  endif
+endif
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -128,7 +136,7 @@ binary-arch: build install
 	@echo >> debian/lsb-core.substvars "provides=lsb-core-${lsbarch}"
 	@echo >> debian/lsb-cxx.substvars "provides=lsb-cxx-${lsbarch}"
 	@echo >> debian/lsb-graphics.substvars "provides=lsb-graphics-${lsbarch}"
-	@[ ${DEB_BUILD_ARCH} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=ia32-libs" || true
+	@[ ${DEB_BUILD_ARCH_CPU} = 'amd64' ] && echo >> debian/lsb-core.substvars "depends=ia32-libs" || true
 	dh_link -a
 	dh_strip -a
 	dh_compress -a